Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Dec 2011 15:50:49 +0000 (07:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Dec 2011 15:50:49 +0000 (07:50 -0800)

Trivial merge